tools: remove hard coded paths in example config files

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

diff --git a/tools/examples/xeninfo.pl b/tools/examples/xeninfo.pl
index 47431c63237129063b40c835068e46720354d4f9..95a15d9595c0f4bf09c9429099bd3b27e98ebf3e 100644 (file)
--- a/tools/examples/xeninfo.pl
+++ b/tools/examples/xeninfo.pl
@@ -210,7 +210,7 @@ sub get_vm_type
                # which is something like:
                # 'PV_kernel': '/boot/vmlinuz-2.6.18-xen',
                # or
-               # 'PV_kernel': '/usr/lib/xen/boot/hvmloader',
+               # 'PV_kernel': 'hvmloader',
                if ("$vm_pv_kernel_results->{'Value'}" =~ m/hvm/i)
                {
                        $host_info{$host_name}{'vms'}{$vm_name_label}{'type'} = "HVM";

diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm
index 420e2b27638487df55dc25b87b55ab510a4eaafb..5f43337007bf5b41a3914537f17d29050f947125 100644 (file)
--- a/tools/examples/xmexample.hvm
+++ b/tools/examples/xmexample.hvm
@@ -6,16 +6,9 @@
 # you can set the parameters for the domain on the xm command line.
 #============================================================================
 
-import os, re
-
-arch_libdir = 'lib'
-arch = os.uname()[4]
-if os.uname()[0] == 'Linux' and re.search('64', arch):
-    arch_libdir = 'lib64'
-
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/lib/xen/boot/hvmloader"
+kernel = "hvmloader"
 
 # The domain build function. HVM domain uses 'hvm'.
 builder='hvm'
@@ -128,7 +121,7 @@ disk = [ 'file:/var/images/min-el3-i386.img,hda,w', ',hdc:cdrom,r' ]
 #============================================================================
 
 # Device Model to be used
-device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm'
+device_model = 'qemu-dm'
 
 #-----------------------------------------------------------------------------
 # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 
@@ -154,7 +147,8 @@ vnc=1
 
 #----------------------------------------------------------------------------
 # address that should be listened on for the VNC server if vnc is set.
-# default is to use 'vnc-listen' setting from /etc/xen/xend-config.sxp
+# default is to use 'vnc-listen' setting from
+# auxbin.xen_configdir() + /xend-config.sxp
 #vnclisten="127.0.0.1"
 
 #----------------------------------------------------------------------------

diff --git a/tools/examples/xmexample.hvm-stubdom b/tools/examples/xmexample.hvm-stubdom
index 5ca3904a99c997ab9deb1bdde1f34c600045b079..a425e83e7c5a6a68e6a4ea1fc5308236b8b11a47 100644 (file)
--- a/tools/examples/xmexample.hvm-stubdom
+++ b/tools/examples/xmexample.hvm-stubdom
@@ -11,7 +11,7 @@
 
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/lib/xen/boot/hvmloader"
+kernel = "hvmloader"
 
 # The domain build function. HVM domain uses 'hvm'.
 builder='hvm'
@@ -118,7 +118,7 @@ disk = [ 'file:/var/images/min-el3-i386.img,hda,w', 'phy:/dev/cdrom,hdc:cdrom,r'
 #
 # STUBDOM: this is a script that creates the stub domain running the device
 # model
-device_model = '/usr/lib/xen/bin/stubdom-dm'
+device_model = 'stubdom-dm'
 
 #-----------------------------------------------------------------------------
 # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 
@@ -146,7 +146,8 @@ vnc=1
 
 #----------------------------------------------------------------------------
 # address that should be listened on for the VNC server if vnc is set.
-# default is to use 'vnc-listen' setting from /etc/xen/xend-config.sxp
+# default is to use 'vnc-listen' setting from
+# auxbin.xen_configdir() + /xend-config.sxp
 #vnclisten="127.0.0.1"
 
 #----------------------------------------------------------------------------

diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub
index 1b687151b60b82c8959c0c1a3783f29656d6545c..85f847c6e902e69f56dd764cbe85ec843d539ba4 100644 (file)
--- a/tools/examples/xmexample.pv-grub
+++ b/tools/examples/xmexample.pv-grub
@@ -8,7 +8,7 @@
 
 #----------------------------------------------------------------------------
 # PV GRUB image file.
-kernel = "/usr/lib/xen/boot/pv-grub.gz"
+kernel = "pv-grub.gz"
 
 # Optional provided menu.lst.
 #ramdisk = "/boot/guests/menu.lst"

diff --git a/tools/examples/xmexample.vti b/tools/examples/xmexample.vti
index d93c6531acad9d6234423c3b28465708f40d2585..f97cbe9f831bcc0f541203177c824ba5475dbff0 100644 (file)
--- a/tools/examples/xmexample.vti
+++ b/tools/examples/xmexample.vti
@@ -12,7 +12,7 @@ arch = os.uname()[4]
 
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/lib/xen/boot/guest_firmware.bin"
+kernel = "guest_firmware.bin"
 
 # The domain build function. VTI domain uses 'hvm'.
 builder='hvm'

diff --git a/tools/python/xen/xm/tests/test_create.py b/tools/python/xen/xm/tests/test_create.py
index 40878128511bc702a610f3fd2e68d94f83f07aaf..54a0573d70b165368c7466563e71f4b441a474a5 100644 (file)
--- a/tools/python/xen/xm/tests/test_create.py
+++ b/tools/python/xen/xm/tests/test_create.py
@@ -153,14 +153,14 @@ cpu_weight = 0.75
         try:
             os.write(fd,
                      '''
-kernel = "/usr/lib/xen/boot/hvmloader"
+kernel = "hvmloader"
 builder='hvm'
 memory = 128
 name = "ExampleHVMDomain"
 vcpus=1
 vif = [ 'type=ioemu, bridge=xenbr0' ]
 disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
-device_model = '/usr/lib/xen/bin/qemu-dm'
+device_model = 'qemu-dm'
 sdl=0
 vnc=1
 vncviewer=1
@@ -170,7 +170,7 @@ ne2000=0
             os.close(fd)
 
         self.t('-f %s display=fakedisplay' % fname,
-               { 'kernel'      : '/usr/lib/xen/boot/hvmloader',
+               { 'kernel'      : 'hvmloader',
                  'builder'     : 'hvm',
                  'memory'      : 128,
                  'name'        : 'ExampleHVMDomain',
@@ -179,7 +179,7 @@ ne2000=0
                  'vif'         : ['type=ioemu, bridge=xenbr0'],
                  'disk'        : [['file:/var/images/min-el3-i386.img',
                                    'ioemu:hda', 'w', None]],
-                 'device_model': '/usr/lib/xen/bin/qemu-dm',
+                 'device_model': 'qemu-dm',
 
                  'extra'       : ('VNC_VIEWER=%s:%d ' %
                                   (xen.xm.create.get_host_addr(),

diff --git a/tools/xm-test/lib/XmTestLib/arch.py b/tools/xm-test/lib/XmTestLib/arch.py
index 32a5958096b426c3a1a648874a6155c698897072..a6607d91dbfd79bae5043818d7f889b1b7829f7d 100644 (file)
--- a/tools/xm-test/lib/XmTestLib/arch.py
+++ b/tools/xm-test/lib/XmTestLib/arch.py
@@ -77,7 +77,7 @@ ia_HVMDefaults =      {"memory"       : 64,
                        "acpi"         : 0,
                        "disk"         : ["file:%s/disk.img,ioemu:%s,w!" %
                                          (getRdPath(), BLOCK_ROOT_DEV)],
-                       "kernel"       : "/usr/lib/xen/boot/hvmloader",
+                       "kernel"       : "hvmloader",
                        "builder"      : "hvm",
                        "sdl"          : 0,
                        "vnc"          : 0,